this is a test
Contents
1. liso engine register http _ disconnect handler amp engine parser disconnect handler liso logging log liso main Starting Liso server on port d port return liso engine event loop amp engine GitHub Git it got it good git clone git github com theonewolf 15 441 Recitation Sessions git2. test CONFLICT content Merge conflict in test Automatic merge failed fix conflicts and then commit the result gt cat test lt lt lt lt lt lt lt HEAD helloX world helloY world gt gt gt gt gt gt gt 29a240d5017c73ca4f78466afcflfd5b8 F46808 Ff Choose how to merge yours or other author s Finalize commit then push or request a pull Svn vs git svn git No local repository Everything is local Centralized Distributed http whygitisbetterthanx com git s Superiority It just is Trust me svn every commit makes trusted code untrusted git commit commit commit rebase merge Extra git tips e gitk GUI to interact with git repository e git svn Use git on top of svn e git branch create dev branches e git tag create release tag e git bisect binary search for bad commit e git rebase forward port local commits git Resources 1 man gittutorial 2 Git User s Manual http www kernel org pub software scm git docs user manual html 3 Git Immersion http gitimmersion com 4 Git Cheatsheet https github com AlexZeitler gitcheatsheet Code Structure GNU make e Recipes for your code e Compilation e Installation e Cleanup e Testing e Composed of a series of e targets the recipes e which have dependencies e and commands e also variables Makefile from recitationl HEHEH HIHI HIHI HIHI IH HIERHER AAA Makefile Description This fi
3. C s in this case 2 hours ago Like k Wolfgang Richter So remember when I said won t coddie Im I took my undergrad networking in Korea TAs e not kind at all They basically gave me a ink to Beejs guide to network programming and some other ink to RFC documents didn t ike that at that time but now think that sometimes we need to let them learn by themselves with some intial pointers Googie because that s what they wil do in the field sooner or later about an hour ago Like Wolfgang Richter Yep no coddling P present syscals to them and point out all the error conditions so they handie them but then they need to read man pages and get dirty writing code And yeah the end of the side set is Inks one to Beefs as wel about an hour ago Like k Wolfgang Richter tis is also a tricky point in my mind We want to teach them certain concepts looking up things is necessary no matter what But think that being lazy as a course staff or not pointing them to material to specifically make them look things up is teaching the wrong thing l d _much_ rather have Students be able to immediately have the material they need to focus on then learning and applying the systems concepts about an hour ago Like a great TA you are ve witnessed some u ike CS guys bet some of them can go beyond or love Wolfs high standard about an hour ago Like them the important things to think about and how to find a
4. Why so software engineeringy Athula Balachandran Wolf Richter Are we really that serious Im now TAing an undergrad course What I m most surprised is that some undergrads are REALLY SMART OTOH grad TA I am so dull and stupid It s because we have tie motivation We do not get paid for TAing My profs may not be happy spend too much time on amp eg 20hr iweek py that officially a TA job 20 hrs week e heard MN enc Woroang Richter had a debate with this issue few days ago mean how smart CMU undergrads are in general I m also TAing an undergrad course and looking forward to seeing bright students 2 hours ago Lke bar as high as possible No coddling We re going deep in hard and fast systems design and development give them source documents and source materials 2 hours ago Like k Wolfgang Richter My vote of confidence is in the students set the Wolfgang Richter How else are you supposed to produce the best grads in the world p 2 hours ago Like Wolfgang Richter see what I ve been up to here https J github comitheonewol 15 441 Recitation Sessions a theonewolf 15 441 Recitation Sessions GitHub Wolfgang Richter This is cool havent seen any courses using github as a class page 2 hours ago Like exposing them to all real tools that wil heip them in Ke p Theyre going to get gt svn and other things exposed to them Also I reference original design documents RF
5. e Wolfgang Richter git config global user email wolf cs cmu edu 1 git clone git git kernel org pub scm git git git 2 git remote add origin git github com username Hello World git Types of Repositories Type Meaning http HTTP hosted repo git Special git server protocol Daily workflow with git e Check for any remote updates e Do your work e Test your work e Check differences try to isolate changes e Commit your work repeat as needed e Check for any remote updates e Push changes or submit pull request Translated to git commands e git pull e Checks for new commits in remote repository e vim emacs make create magic etc e make test run your changes e git status e See all changed files e git diff e Understand differences line by line like diff util e git add e Stage changes potentially line by line e git commit m Isolated changes x and y e git push Example repository gt git pull Already up to date gt git status On branch master Your branch is ahead of origin master by 1 commit Untracked files use git add lt file gt to include in what will be committed Changed but not updated use git add lt file gt to update what will be committed use git checkout lt file gt to discard changes in working directory modified src recitation2 odp src liso c no changes added to com
6. h this now when backup Is 20 minutes away and you do not know if these people will be armed and desperate enough to shoot first Why The reason the data is not available is that there was no backup that took over immediately on failure We deal with this in many ways short term with clustering servers having mirrors or RAID for data should data storage fall network redundancy should a network connection fail However there may also be a deeper reason for the failure which is dealt with in another way disaster recovery and above that COOP or Continuance Of OPerations should a major disaster occur Netflix and the Chaos Monkey One of a few surviving AWS EC2 outages Randomly fail running instances Randomly fail processes Randomly introduce network failures Execute rarely encountered code paths On the production system We ll be focusing on Backups Code Documentation Source Control Management Code Structuring and Modularity Subversion svn Usually remotely hosted ___ Shared with a team lt svn checkout svn commit svn update Your private universe before commit Getting started with svn Roll your own Not your own e svnadmin create repo e svn checkout https e svn checkout file svn repo Types of Repositories Type Meaning http WebDAV protocol via Apache svn Access svnserve via custom protocol Daily workflow with svn e Check for any remote updates e Do y
7. k Sending test Transmitting file data svn Commit failed details follow svn User blockme does not own lock on path test currently locked by wolf 1 gt echo maybe if you re nice gt test 1 gt svn commit username wolf m finished with test Sending test Transmitting file data Committed revision 3 Merging in Practice 2 gt svn update Conflict discovered in test Select p postpone df diff full e edit mc mine conflict tc theirs conflict s show all options Merging options Type Meaning diff full Show all changes mine conflict Accept your version only show Show more all options Svn Resources 1 svn help 2 svn book http svnbook red bean com en 1 6 svn book html 3 svn Cheatsheet http www addedbytes com cheat sheets subversion cheat sheet git Fun fun fun You already use it right GitHub lf not let s go down the rabbit hole Resume padding Resume creator git No notion of working copy each is a full repository D D git push i Sa a push ee kernel ghub lt a torvalds jaharkes end end git pull git pull git push git pull u bgilbert abalacha etl git N wolf Lo pull Getting started with git Roll your own git config global user name Wolfgang Richter git config global user email wolf cs cmu edu git init 4 Not your own git config global user nam
8. le contains the make rules for Recitation 1 Authors Athula Balachandran lt abalacha cs cmu edu gt Wolf Richter lt wolf cs cmu edu gt HEHEH HIHI HIHI HIHI HIHHIHHIHHIH AAA SERVER SRC echo server c CLIENT SRC echo client c OPTIONS Wall default echo server echo client echo server gcc SERVER SRC o echo server OPTIONS echo client gcc CLIENT SRC o echo client OPTIONS clean rm echo server echo client GNU make Resources 1 GNU make Manual http www gnu org software make manual html_node index html Wanna be official e Learn GNU autotools e Standardize workflow with e Generation of configure script e Generation of Makefiles and make install target e Generation of helper scripts e Preparing to release open source e 1 Pick a license e 2 autotoolize e 3 GitHub include include include include include define int main lt stdio h gt Project 1 Sneak Peek select _engine h http _parser h Logging h USAGE nUsage s lt PORT gt lt LOG FILE gt lt LOCK FILE gt n n int argc char argv int port char flog flock if argc lt 4 fprintf stdout USAGE argv 0 return EXIT FAILURE port atoi argv 1 flog argv 2 flock argv 3 struct select_engine engine liso engine create amp engine port flog flock liso engine register http _handler amp engine parser_http_handler
9. mit use git add and or git commit a gt git diff diff git a recitation2 src recitation2 odp b recitation2 src recitation2 odp index d3289ed 9alfec3 100644 Binary files a recitation2 src recitation2 odp and b recitation2 src recitation2 odp differ Example repository git add src recitation2 odp git status On branch master Your branch is ahead of origin master by 1 commit Changes to be committed use git reset HEAD lt file gt to unstage modified src recitation2 odp Untracked files use git add lt file gt to include in what will be committed src liso c git commit m working on git section also hello class master 73d717b working on git section also hello class 1 files changed insertions deletions gt git push Counting objects 12 done Delta compression using up to 2 threads Compressing objects 100 9 9 done Writing objects 100 11 11 653 27 KiB done Total 11 delta 3 reused delta 0 To git github com theonewolf 15 441 Recitation Sessions git 2e7a 63 73d717b master gt master VIR HE HE HE HE HE HE HE HE HE HE V V Dealing with collaboration e Branching Cheap and effective e Make development or feature branches e Rebase and merge when features complete e git branch https e git checkout https e Pull Push with Merge e Standard model pull requests e Or push into central repository Merging in Practice gt git pull Auto merging
10. mp and then let them build complex things with the buiding blocks start them with k Wolfgang Richter My main goal is to lead by example show Actually yes yes we are But we can have fun too Case Study from Industry Imagine you are a police officer on the road at 2 14am and there is a van weaving around on the road in front of you and it is obviously full of people who are dressed alike and have many different pieces of luggage and other objects that you can t quite see clearly in the vehicle Mission critical applications You reach over to your laptop mounted in your police car and key in the make model and license number and state The message on the screen says Sorry this application is not available for the next 30 minutes Just a short outage You can imagine any possibility a church group on an outing someone driving getting tired a drunk driving his family a smuggler bringing illegal aliens a smuggler bringing in illegal drugs or for the fun of it a group of terrorists preparing a major attack What do you do now You have no information from a mission critical system with access to all sorts of databases including who the owners of the vehicle are who might have leased it rented it or is the main driver for it and intelligence data bases that can tell you if it might be illegals or terrorists or some other sort of criminal As a single police officer who has to deal wit
11. our work e Test your work e Check differences try to isolate changes e Check for any remote updates e Commit your work Translated to svn commands svn update e Checks for new commits in remote repository vim emacs make create magic etc make test run your changes Svn status e See all changed files svn diff e Understand differences line by line like diff util svn update svn commit m Isolated changes x and y gt svn update Example repository gt echo this is a test gt test gt svn add test A test gt svn commit m added a test Adding test Transmitting file data Committed revision 1 gt svn update At revision 1 gt echo new text gt test gt svn status M test gt svn diff Index test test revision 1 test working copy 1 1 this is a test new text gt svn update At revision 1 gt svn commit m updated text Sending test Transmitting file data Committed revision 2 Dealing with collaboration e Lock modify unlock e svn lock lt path gt e Modifications e svn unlock lt path gt e Copy modify merge e Optimistically edit things e Merge any files that others also commit Locking in Practice 1 gt svn lock test test locked by user wolf 2 gt svn status username blockme u 0 2 test Status against revision 2 2 gt echo i can have lock gt test 2 gt svn commit username blockme m block on loc
Download Pdf Manuals
Related Search